Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Thu, 29 Mar 2018 12:25:56 +0000 (08:25 -0400)
committerTom Rini <[email protected]>
Thu, 29 Mar 2018 12:25:56 +0000 (08:25 -0400)

Trivial merge